Auto merge of #4244 - est31:master, r=matklad
authorbors <bors@rust-lang.org>
Sun, 2 Jul 2017 11:08:30 +0000 (11:08 +0000)
committerbors <bors@rust-lang.org>
Sun, 2 Jul 2017 11:08:30 +0000 (11:08 +0000)
commit5bf71aba8799e8866e179addafc8fe3d932f05c3
tree2e114ba24d4fe63dbb83798fed9d367654d4b73b
parentd2d6e675fcb70cfb91c2cf2fad8cdd345c120316
parent6f34f863c4f0dcf6d89f305ca533f2a34402b591
Auto merge of #4244 - est31:master, r=matklad

Let the cargo_bench_failing_test tolerate col info

Needed by https://github.com/rust-lang/rust/pull/42938